(x_set_menu_bar_lines) [USE_X_TOOLKIT]: When turning

menu bar on, make sure next redisplay creates it.

diff --git a/src/xfns.c b/src/xfns.c
index 10d8fab110951a596f8c71b5e17b227d72e26d32..31cee63fff27d82ee569156a452d4f13dcfbd908 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1694,7 +1694,12 @@ x_set_menu_bar_lines (f, value, oldval)
 #ifdef USE_X_TOOLKIT
   FRAME_MENU_BAR_LINES (f) = 0;
   if (nlines)
-    FRAME_EXTERNAL_MENU_BAR (f) = 1;
+    {
+      FRAME_EXTERNAL_MENU_BAR (f) = 1;
+      if (f->output_data.x->menubar_widget == 0)
+       /* Make sure next redisplay shows the menu bar.  */
+       XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = Qt;
+    }
   else
     {
       if (FRAME_EXTERNAL_MENU_BAR (f) == 1)